Auto merge of #2496 - alexcrichton:fix-concurrent, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 18 Mar 2016 18:07:20 +0000 (11:07 -0700)
committerbors <bors@rust-lang.org>
Fri, 18 Mar 2016 18:07:20 +0000 (11:07 -0700)
Relax an assertion in the concurrent tests

The output may also have information about blocking, we just want the successful
part.


Trivial merge